oc: Make env use PATCH instead of PUT #5819

0xmichalis · 2015-11-10T12:35:10Z

0xmichalis · 2015-11-10T13:00:06Z

I see that the response from the server after PATCH is exactly the same as the GET which means that the patch somehow isn't applied in the server. @deads2k any ideas why this happens in Origin? I tested label in Kubernetes and it works fine.

I1110 12:56:39.868151    2013 debugging.go:99] GET https://localhost:8443/oapi/v1/namespaces/test/deploymentconfigs/database
I1110 12:56:39.868183    2013 debugging.go:106] Request Headers:
I1110 12:56:39.868196    2013 debugging.go:109]     User-Agent: oc/v1.0.8 (linux/amd64) openshift/33ebfef
I1110 12:56:39.868208    2013 debugging.go:109]     Authorization: Bearer AlY7V4Y6e2Ea5sEDQ_jTxUzuPXh2LUaRS_cz2PNwkqE
I1110 12:56:39.870988    2013 debugging.go:124] Response Status: 200 OK in 2 milliseconds
I1110 12:56:39.871401    2013 debugging.go:127] Response Headers:
I1110 12:56:39.871700    2013 debugging.go:130]     Content-Type: application/json
I1110 12:56:39.872012    2013 debugging.go:130]     Date: Tue, 10 Nov 2015 12:56:39 GMT
I1110 12:56:39.872401    2013 debugging.go:130]     Content-Length: 1523
I1110 12:56:39.872677    2013 debugging.go:130]     Cache-Control: no-store
I1110 12:56:39.873080    2013 request.go:796] Response Body: {"kind":"DeploymentConfig","apiVersion":"v1","metadata":{"name":"database","namespace":"test","selfLink":"/oapi/v1/namespaces/test/deploymentconfigs/database","uid":"a6bf81de-8796-11e5-8c7f-080027c5bfa9","resourceVersion":"1054","creationTimestamp":"2015-11-10T10:34:41Z","labels":{"template":"application-template-stibuild"}},"spec":{"strategy":{"type":"Recreate","recreateParams":{"pre":{"failurePolicy":"Abort","execNewPod":{"command":["/bin/true"],"env":[{"name":"CUSTOM_VAR1","value":"custom_value1"}],"containerName":"ruby-helloworld-database"}},"post":{"failurePolicy":"Ignore","execNewPod":{"command":["/bin/false"],"env":[{"name":"CUSTOM_VAR2","value":"custom_value2"}],"containerName":"ruby-helloworld-database"}}},"resources":{}},"triggers":[{"type":"ConfigChange"}],"replicas":1,"selector":{"name":"database"},"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"database"}},"spec":{"containers":[{"name":"ruby-helloworld-database","image":"openshift/mysql-55-centos7:latest","ports":[{"containerPort":3306,"protocol":"TCP"}],"env":[{"name":"MYSQL_USER","value":"userASW"},{"name":"MYSQL_PASSWORD","value":"8I0BvktP"},{"name":"MYSQL_DATABASE","value":"root"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"Always","securityContext":{"capabilities":{},"privileged":false}}],"restartPolicy":"Always","terminationGracePeriodSeconds":30,"dnsPolicy":"ClusterFirst","securityContext":{}}}},"status":{"latestVersion":1,"details":{"causes":[{"type":"ConfigChange"}]}}}
I1110 12:56:39.880074    2013 request.go:533] Request Body: {"Template":{"ControllerTemplate":{"template":{"spec":{"containers":[{"env":[{"name":"MYSQL_USER","value":"userASW"},{"name":"MYSQL_PASSWORD","value":"8I0BvktP"},{"name":"MYSQL_DATABASE","value":"root"},{"name":"NEW","value":"ENV"}],"image":"openshift/mysql-55-centos7:latest","imagePullPolicy":"Always","name":"ruby-helloworld-database","ports":[{"containerPort":3306,"protocol":"TCP"}],"resources":{},"securityContext":{"capabilities":{},"privileged":false},"terminationMessagePath":"/dev/termination-log"}]}}}}}
I1110 12:56:39.880811    2013 debugging.go:99] PATCH https://localhost:8443/oapi/v1/namespaces/test/deploymentconfigs/database
I1110 12:56:39.881191    2013 debugging.go:106] Request Headers:
I1110 12:56:39.881509    2013 debugging.go:109]     Content-Type: application/strategic-merge-patch+json
I1110 12:56:39.881746    2013 debugging.go:109]     User-Agent: oc/v1.0.8 (linux/amd64) openshift/33ebfef
I1110 12:56:39.881968    2013 debugging.go:109]     Authorization: Bearer AlY7V4Y6e2Ea5sEDQ_jTxUzuPXh2LUaRS_cz2PNwkqE
I1110 12:56:39.916782    2013 debugging.go:124] Response Status: 200 OK in 34 milliseconds
I1110 12:56:39.918118    2013 debugging.go:127] Response Headers:
I1110 12:56:39.918246    2013 debugging.go:130]     Cache-Control: no-store
I1110 12:56:39.920118    2013 debugging.go:130]     Content-Type: application/json
I1110 12:56:39.920312    2013 debugging.go:130]     Date: Tue, 10 Nov 2015 12:56:39 GMT
I1110 12:56:39.920380    2013 debugging.go:130]     Content-Length: 1523
I1110 12:56:39.920459    2013 request.go:796] Response Body: {"kind":"DeploymentConfig","apiVersion":"v1","metadata":{"name":"database","namespace":"test","selfLink":"/oapi/v1/namespaces/test/deploymentconfigs/database","uid":"a6bf81de-8796-11e5-8c7f-080027c5bfa9","resourceVersion":"1274","creationTimestamp":"2015-11-10T10:34:41Z","labels":{"template":"application-template-stibuild"}},"spec":{"strategy":{"type":"Recreate","recreateParams":{"pre":{"failurePolicy":"Abort","execNewPod":{"command":["/bin/true"],"env":[{"name":"CUSTOM_VAR1","value":"custom_value1"}],"containerName":"ruby-helloworld-database"}},"post":{"failurePolicy":"Ignore","execNewPod":{"command":["/bin/false"],"env":[{"name":"CUSTOM_VAR2","value":"custom_value2"}],"containerName":"ruby-helloworld-database"}}},"resources":{}},"triggers":[{"type":"ConfigChange"}],"replicas":1,"selector":{"name":"database"},"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"database"}},"spec":{"containers":[{"name":"ruby-helloworld-database","image":"openshift/mysql-55-centos7:latest","ports":[{"containerPort":3306,"protocol":"TCP"}],"env":[{"name":"MYSQL_USER","value":"userASW"},{"name":"MYSQL_PASSWORD","value":"8I0BvktP"},{"name":"MYSQL_DATABASE","value":"root"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"Always","securityContext":{"capabilities":{},"privileged":false}}],"restartPolicy":"Always","terminationGracePeriodSeconds":30,"dnsPolicy":"ClusterFirst","securityContext":{}}}},"status":{"latestVersion":1,"details":{"causes":[{"type":"ConfigChange"}]}}}
deploymentconfig "database" updated

liggitt · 2015-11-10T13:20:52Z

pkg/cmd/cli/cmd/env.go

-	for _, info := range infos {
+	oldData := make([][]byte, len(infos))
+	for i, info := range infos {
+		old, err := json.Marshal(info.Object)


does this even give you versioned JSON? don't you have to use info.Codec to do this (and are you sure that will result in a patch that is valid against the client's API version?)

Thanks, by using versioned objects this works like a charm.

I guess Latest() populates VersionedObject from the API, which (maybe?) forces it to the API version the client will use? Can you test this with input from a file containing a v1beta3 object to make sure v1 is used to create the patch and submit to the server?

Sorry, I still haven't pushed my latest changes. Latest doesn't do that ... most probably..

But I will definitely test including your case

0xmichalis · 2015-11-10T16:03:41Z

[test]

0xmichalis · 2015-11-10T17:15:04Z

@liggitt ptal

0xmichalis · 2015-11-11T17:57:26Z

UI flake

re[test]

0xmichalis · 2015-11-12T11:37:55Z

error: unable to import image: the default tag "5.7.7" has not been set on repository "library/mysql"
!!! Error in test/cmd/images.sh:80
    '[ "$(oc import-image mysql --from=mysql --confirm | grep "sha256:")" ]' exited with status 1
Call stack:
    1: test/cmd/images.sh:80 main(...)
Exiting with status 1
!!! Error in hack/test-cmd.sh:281
    '${test}' exited with status 1
Call stack:
    1: hack/test-cmd.sh:281 main(...)
Exiting with status 1
[FAIL] !!!!! Test Failed !!!!

re[test]

0xmichalis · 2015-11-12T12:06:38Z

!!! Error in hack/build-images.sh:61
    'docker build -t $1:latest $2' exited with status 1
Call stack:
    1: hack/build-images.sh:61 image(...)
    2: hack/build-images.sh:79 main(...)
Exiting with status 1
make: *** [release] Error 1

failed docker-build flake rere[test]

0xmichalis · 2015-11-18T23:47:12Z

cc: @fabianofranz @smarterclayton

0xmichalis · 2015-11-19T11:00:45Z

https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7223/console

Error while running ssh/sudo command: 
set -e
pushd /data/src/github.com/openshift//origin >/dev/null
export PATH=$GOPATH/bin:$PATH

echo '***************************************************'
echo 'Running hack/test-assets.sh...'
time hack/test-assets.sh
echo 'Finished hack/test-assets.sh'
echo '***************************************************'

popd >/dev/null

SSH authentication failed! This is typically caused by the public/private
keypair for the SSH user not being properly set on the guest VM. Please
verify that the guest VM is setup with the proper public key, and that
the private key path for Vagrant is setup properly as well.
...
Error: EC2 Machine is not available
Build step 'Execute a set of scripts' marked build as failure
Finished: FAILURE

cc: @danmcp

re[test]

liggitt · 2015-11-19T16:35:45Z

pkg/cmd/cli/cmd/env.go

@@ -232,6 +234,21 @@ func RunEnv(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra.Comman
 	if !one && len(resourceVersion) > 0 {
 		return cmdutil.UsageError(cmd, "--resource-version may only be used with a single resource")
 	}
+	// Keep a copy of the original objects prior to updating their environment.
+	// Used in constructing the patch(es) that will be applied in the server.
+	oldObjects, err := resource.AsVersionedObjects(infos, outputVersion)


outputVersion := cmdutil.OutputVersion(cmd, clientConfig.Version) ensures we're working with the same version we're going to submit to the server, right?

Not necessarily - clientConfig.Version becomes the default if no output
version is provided.

On Nov 19, 2015, at 11:50 AM, Jordan Liggitt notifications@github.com
wrote:

In pkg/cmd/cli/cmd/env.go
#5819 (comment):

@@ -232,6 +234,21 @@ func RunEnv(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra.Comman
if !one && len(resourceVersion) > 0 {
return cmdutil.UsageError(cmd, "--resource-version may only be used with a single resource")
}

// Keep a copy of the original objects prior to updating their environment.

// Used in constructing the patch(es) that will be applied in the server.

oldObjects, err := resource.AsVersionedObjects(infos, outputVersion)

outputVersion := cmdutil.OutputVersion(cmd, clientConfig.Version) ensures
we're working with the same version we're going to submit to the server,
right?

—
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/5819/files#r45364573.

should --output-version or --api-version be used to decide the version we base patches on?

we should be using clientConfig.Version to build oldObjects and oldData, right?

Right, forgot to switch this. Updated.

0xmichalis · 2015-11-23T17:48:41Z

[test]

0xmichalis · 2015-11-23T19:23:17Z

@liggitt tests added, ptal

liggitt · 2015-11-23T19:42:20Z

test/cmd/deployments.sh

@@ -16,8 +16,14 @@ oc create -f test/integration/fixtures/test-deployment-config.json
 oc describe deploymentConfigs test-deployment-config
 [ "$(oc get dc -o name | grep 'deploymentconfig/test-deployment-config')" ]
 [ "$(oc describe dc test-deployment-config | grep 'deploymentconfig=test-deployment-config')" ]
+# Patch a nil list
+oc env dc/test-deployment-config TEST=value


can we add checks to make sure the env command 1) actually took effect and 2) didn't change anything else?

did 1, not sure how to check for 2

liggitt · 2015-11-25T16:59:23Z

hack/cmd_util.sh

@@ -31,6 +31,19 @@ function os::cmd::expect_success_and_text() {
 	os::cmd::internal::expect_exit_code_run_grep "${cmd}" "os::cmd::internal::success_func" "${expected_text}"
 }

+# expect_success_and_multiple_text runs the cmd and expects an exit code of 0
+# as well as running a grep test to find the given strings in the output
+# TODO: Run the command once and not for every string.


need to run once, grep multiple before this can merge

updated the todo message

or did you mean to actually implement it?

actually implement it... we can't assume the command is side-effect free

if you don't want to implement it now, that's fine, just run multiple expect_success_and_text calls in the test

ok, updated to run multiple calls

0xmichalis · 2015-11-29T21:35:57Z

@liggitt anything else tbd here?

liggitt · 2015-11-30T16:15:32Z

pkg/cmd/cli/cmd/env.go

 	if len(outputFormat) != 0 {
+		objects, err := resource.AsVersionedObjects(infos, outputVersion)


I think this is the only place outputVersion should be used

0xmichalis · 2015-12-01T10:42:19Z

Never seen this before (#6137)

--- FAIL: TestTranslateTimestamp (0.00s)
    resource_printer_test.go:1222: On months ago, expected '92d', but got '91d'
FAIL
coverage: 50.9% of statements
FAIL    github.com/openshift/origin/Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl 0.353s

0xmichalis · 2015-12-01T10:42:53Z

re[test]

smarterclayton · 2015-12-01T11:01:31Z

Yuck, time zone bug. Tests will fail. Spawn an issue.

On Dec 1, 2015, at 5:42 AM, Michail Kargakis notifications@github.com
wrote:

Never seen this before

--- FAIL: TestTranslateTimestamp (0.00s)
resource_printer_test.go:1222: On months ago, expected '92d', but got '91d'
FAIL
coverage: 50.9% of statements
FAIL github.com/openshift/origin/Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl
0.353s

—
Reply to this email directly or view it on GitHub
#5819 (comment).

openshift-bot · 2015-12-01T13:35:13Z

Evaluated for origin test up to 0c57b08

openshift-bot · 2015-12-01T14:29:28Z

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7569/)

0xmichalis · 2015-12-01T14:31:58Z

@liggitt can we merge this now?

liggitt · 2015-12-01T14:34:26Z

yup, LGTM

0xmichalis · 2015-12-01T14:34:52Z

[merge]

liggitt · 2015-12-01T14:35:08Z

Mentioned API version negotiation issue in #5216 (comment)

openshift-bot · 2015-12-01T14:35:31Z

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4207/) (Image: devenv-rhel7_2851)

openshift-bot · 2015-12-01T14:35:32Z

Evaluated for origin merge up to 0c57b08

Merged by openshift-bot

0xmichalis mentioned this pull request Nov 10, 2015

oc env doesn't handle update error #5816

Closed

liggitt reviewed Nov 10, 2015
View reviewed changes

0xmichalis changed the title ~~[WIP] env: Switch to PATCH~~ env: Switch to PATCH Nov 10, 2015

0xmichalis changed the title ~~env: Switch to PATCH~~ oc: Make env use PATCH instead of PUT Nov 18, 2015

liggitt reviewed Nov 19, 2015
View reviewed changes

openshift-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 21, 2015

liggitt reviewed Nov 23, 2015
View reviewed changes

openshift-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 24, 2015

liggitt reviewed Nov 25, 2015
View reviewed changes

miminar mentioned this pull request Nov 27, 2015

Jenkins flake on pinging /healthz #6031

Closed

liggitt mentioned this pull request Nov 27, 2015

Bug1277038 - Differ between oc env updates(removes/adds) the resource(s) envvars and when it doesnt #6104

Closed

liggitt reviewed Nov 30, 2015
View reviewed changes

oc: Make env use PATCH instead of PUT

0c57b08

openshift-bot pushed a commit that referenced this pull request Dec 2, 2015

Merge pull request #5819 from kargakis/use-patch-in-oc-env

5162e93

Merged by openshift-bot

openshift-bot merged commit 5162e93 into openshift:master Dec 2, 2015

0xmichalis deleted the use-patch-in-oc-env branch December 2, 2015 10:04

		if len(outputFormat) != 0 {
		objects, err := resource.AsVersionedObjects(infos, outputVersion)

oc: Make env use PATCH instead of PUT #5819

oc: Make env use PATCH instead of PUT #5819

Conversation

0xmichalis commented Nov 10, 2015

0xmichalis commented Nov 10, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xmichalis commented Nov 10, 2015

0xmichalis commented Nov 10, 2015

0xmichalis commented Nov 11, 2015

0xmichalis commented Nov 12, 2015

0xmichalis commented Nov 12, 2015

0xmichalis commented Nov 18, 2015

0xmichalis commented Nov 19, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xmichalis commented Nov 23, 2015

0xmichalis commented Nov 23, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xmichalis commented Nov 29, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xmichalis commented Dec 1, 2015

0xmichalis commented Dec 1, 2015

smarterclayton commented Dec 1, 2015

openshift-bot commented Dec 1, 2015

openshift-bot commented Dec 1, 2015

0xmichalis commented Dec 1, 2015

liggitt commented Dec 1, 2015

0xmichalis commented Dec 1, 2015

liggitt commented Dec 1, 2015

openshift-bot commented Dec 1, 2015

openshift-bot commented Dec 1, 2015